gtk-demo: Get rid of gdk_drawable_get_size() usage

diff --git a/demos/gtk-demo/offscreen_window.c b/demos/gtk-demo/offscreen_window.c
index 98228f03ab640861b1d4c86bd716aa82f064e3fd..96fd8d40313e9704e91a01d8aef789f5aa4c076b 100644 (file)
--- a/demos/gtk-demo/offscreen_window.c
+++ b/demos/gtk-demo/offscreen_window.c
@@ -475,7 +475,6 @@ gtk_rotated_bin_draw (GtkWidget *widget,
 {
   GtkRotatedBin *bin = GTK_ROTATED_BIN (widget);
   GdkWindow *window;
-  gint width, height;
   gdouble s, c;
   gdouble w, h;
 
@@ -502,8 +501,10 @@ gtk_rotated_bin_draw (GtkWidget *widget,
           cairo_translate (cr, -child_area.width / 2, -child_area.height / 2);
 
           /* clip */
-          gdk_drawable_get_size (bin->offscreen_window, &width, &height);
-          cairo_rectangle (cr, 0, 0, width, height);
+          cairo_rectangle (cr,
+                           0, 0,
+                           gdk_window_get_width (bin->offscreen_window),
+                           gdk_window_get_height (bin->offscreen_window));
           cairo_clip (cr);
           /* paint */
           cairo_set_source_surface (cr, surface, 0, 0);
@@ -512,12 +513,12 @@ gtk_rotated_bin_draw (GtkWidget *widget,
     }
   if (gtk_cairo_should_draw_window (cr, bin->offscreen_window))
     {
-      gdk_drawable_get_size (bin->offscreen_window, &width, &height);
-
       gtk_paint_flat_box (gtk_widget_get_style (widget), cr,
                           GTK_STATE_NORMAL, GTK_SHADOW_NONE,
                           widget, "blah",
-                          0, 0, width, height);
+                          0, 0,
+                          gdk_window_get_width (bin->offscreen_window),
+                          gdk_window_get_height (bin->offscreen_window));
 
       if (bin->child)
         gtk_container_propagate_draw (GTK_CONTAINER (widget),

diff --git a/demos/gtk-demo/offscreen_window2.c b/demos/gtk-demo/offscreen_window2.c
index c271ce3ed29e72b1b24ad1e7a8cedafadb8c85af..b623e303ef5990154ce7d8c9134bc19483eaca84 100644 (file)
--- a/demos/gtk-demo/offscreen_window2.c
+++ b/demos/gtk-demo/offscreen_window2.c
@@ -381,7 +381,6 @@ gtk_mirror_bin_draw (GtkWidget *widget,
 {
   GtkMirrorBin *bin = GTK_MIRROR_BIN (widget);
   GdkWindow *window;
-  gint width, height;
 
   window = gtk_widget_get_window (widget);
   if (gtk_cairo_should_draw_window (cr, window))
@@ -389,11 +388,12 @@ gtk_mirror_bin_draw (GtkWidget *widget,
       cairo_surface_t *surface;
       cairo_matrix_t matrix;
       cairo_pattern_t *mask;
+      int height;
 
       if (bin->child && gtk_widget_get_visible (bin->child))
         {
           surface = gdk_offscreen_window_get_surface (bin->offscreen_window);
-          gdk_drawable_get_size (bin->offscreen_window, &width, &height);
+          height = gdk_window_get_height (bin->offscreen_window);
 
           /* paint the offscreen child */
           cairo_set_source_surface (cr, surface, 0, 0);
@@ -422,12 +422,12 @@ gtk_mirror_bin_draw (GtkWidget *widget,
     }
   else if (gtk_cairo_should_draw_window (cr, bin->offscreen_window))
     {
-      gdk_drawable_get_size (bin->offscreen_window, &width, &height);
-
       gtk_paint_flat_box (gtk_widget_get_style (widget), cr,
                           GTK_STATE_NORMAL, GTK_SHADOW_NONE,
                           widget, "blah",
-                          0, 0, width, height);
+                          0, 0,
+                          gdk_window_get_width (bin->offscreen_window),
+                          gdk_window_get_height (bin->offscreen_window));
 
       if (bin->child)
         gtk_container_propagate_draw (GTK_CONTAINER (widget),